Merge changes I0bf63dfc,Ib983dc7f into tm-dev am: dbdc7f6601 am: 10ea39f0ac

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/18868787

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