[automerger skipped] DO NOT MERGE Disable NotifShelfRefactor teamfood am: c164c2b6 am: 112aeb84 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23615616



Change-Id: I024c914ee5f827856edb943fe1bea21ca1c7ff64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>