Merge "Enable NOTIFICATION_SHELF_REFACTOR for Teamfood" into udc-qpr-dev am: 0a2967455b am: 918914e7ad

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

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