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

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



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