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

Merge changes from topic "b235268992_debug_command_tm_dev" into tm-dev am: ae7ebc51 am: 1dd369d8

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



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