Merge cherrypicks of [16212023] into sc-qpr1-release. am: 05c10bf8b5

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

Change-Id: Idf5df5dd9db686b240ccc6a90920d896634aab79