Merge "Stop the searching of broadcast" into udc-qpr-dev am: c97fe1a2 am: f75356ca

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



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