Merge "[Broadcast] Stop the searching of broadcast" into udc-qpr-dev am: df39bfee am: e087bfd9

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



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