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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508166



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