Merge "Add a new cmd to wait for a specific broadcast to be dispatched." into...

Merge "Add a new cmd to wait for a specific broadcast to be dispatched." into udc-dev am: 4bd98b45 am: bab8b391 am: b8d9cfa3 am: 6a71bf46

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



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