Merge "Merge changes from topic "shell_command_handler" into tm-qpr-dev am:...

Merge "Merge changes from topic "shell_command_handler" into tm-qpr-dev am: be8ad352" into tm-qpr-dev-plus-aosp am: dcb17446

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



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