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 am: e23c2df7

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



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