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: ed2bc5bb" into tm-d1-dev-plus-aosp am: 6b0db00c am: 3b0fbf98

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



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