Merge changes Ib0dedf31,I164ec7c6,I8f839d41 into sc-v2-dev am: ffa97133dd am: a6c89bdd6e

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

Change-Id: Ibea7688f92678a2cb05d7d6bbfb720448e1dd691