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

[automerger skipped] Merge "[pm] shell command to wait for handler(s)" into udc-dev am: 5d67812f am: 721f4af1 am: 365314e7 -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: I231b62f94854a77e715454f35a7b6dee1c568fb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>