Merge "Increase the broadcast timeout duration in the tests." into udc-qpr-dev...

Merge "Increase the broadcast timeout duration in the tests." into udc-qpr-dev am: 4683f59e am: 036cf3eb

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



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