Merge "Updates to use flash notification settings keys in settings provider"...

Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c3

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



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