Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213 am: 3e304f9e1f

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

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