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

[automerger skipped] DO NOT MERGE Disable NotifShelfRefactor teamfood am: c164c2b6 am: a608535c am: 1323680d am: f837e6fb -s ours

am skip reason: subject contains skip directive

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



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