Merge "Applies feature flag on Flash Notifications" into udc-dev am: 95d82c46 am: 5256bbc6

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



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