[automerger skipped] Merge "[pm] shell command to wait for handler(s)" into udc-dev am: 5d67812f am: 0bef4b56 -s ours

am skip reason: Merged-In I43c281a4f17edc3982a7885a39b1182be57c4504 with SHA-1 09a0e09c is already in history

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



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