Merge "Merge "Introduce run-cleanup adb command for CTS test" into tm-dev am:...

Merge "Merge "Introduce run-cleanup adb command for CTS test" into tm-dev am: ea8aa9e3 am: bd4ae50c" into tm-d1-dev-plus-aosp am: 6869e3aa

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



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