Merge "Deflake tests due to real UserBroadcastDispatcher" into rvc-dev am: 1876a79717 am: ef2facf5ec

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

Change-Id: Ie15bf8745210f6e095f7454abec8ae4a7ef2a2a2