[automerger skipped] DO NOT MERGE Disable NotifShelfRefactor teamfood am:...

[automerger skipped] DO NOT MERGE Disable NotifShelfRefactor teamfood am: c164c2b6 am: 9fe8ca4f am: 49caa84c am: 707a5ec0 -s ours

am skip reason: subject contains skip directive

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



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