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 am: ea3d12ec am: 8d973f4b

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



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