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

Change-Id: Ic3ffeb5bdb306dc7760a9437bfdd7af3de1e23c7