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

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



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