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

[automerger skipped] DO NOT MERGE Disable NotifShelfRefactor teamfood am: c164c2b6 am: 9fe8ca4f am: 0a71afec am: a80dbea6 -s ours

am skip reason: subject contains skip directive

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



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