Merge changes I43dcd40f,I409325e5,Ib3c613a3,I1252c0b5,I00c36184 into qt-dev am: 03a68f15f1 am: 497c15db75

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c3adfba7effe5c0dfdadc07d47e4b3ba781b475