Merge "Synchronize broadcasts so that beginBroadcast does not get called...

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

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



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