[automerger skipped] Merge "Merge "[pm] shell command to wait for handler(s)"...

[automerger skipped] Merge "Merge "[pm] shell command to wait for handler(s)" into udc-dev am: 5d67812f am: 721f4af1" into udc-d1-dev-plus-aosp am: f7365288 -s ours

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

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



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