Merge "[pm] shell command to wait for handler(s)" into udc-dev am: 5d67812f...

Merge "[pm] shell command to wait for handler(s)" into udc-dev am: 5d67812f am: 721f4af1 am: 12f7a013

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



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