Merge "DO NOT MERGE Disable NotifShelfRefactor teamfood" into udc-dev am: 20a77c7b am: c838f266

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



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