[automerger skipped] Merge "DO NOT MERGE Disable NotifShelfRefactor teamfood"...

[automerger skipped] Merge "DO NOT MERGE Disable NotifShelfRefactor teamfood" into udc-dev am: 20a77c7b am: c838f266 am: 8a097373 am: 1af05ce9 -s ours

am skip reason: subject contains skip directive

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



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