Merge cherrypicks of [20111692] into tm-qpr1-release. am: 2f315a626e

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

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