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

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



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