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

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

Change-Id: Iab4b90d1340959038d46a35015a15261526bab88