Merge "Synchronize broadcasts so that beginBroadcast does not get called twice" into udc-dev am: 3b6d92d579 am: 5baf69e497

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

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