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: e17b1d4d

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



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