Merge changes I1e21ab46,Ic4f298d7,I8d1c0738,I84b93d5a into qt-dev am: 68e06d0995 am: 1fc1637595

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

Change-Id: I7ebdd53f8cc44386ec528dd633d3cea52ad097b1