Merge changes I48b96a7f,I28e339aa,I398b9700,I51cf216b,Iab20abe6, ... into qt-dev am: 11eecc19c5 am: 4e21d3fe16 am: 7a654d2d08 am: e208c128ef

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

Change-Id: I93e3facf7cb0668d9733a9d12a04a787228f29d4