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

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



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