Merge changes Ib51be068,If07e7dfa into qt-dev am: a88fde2ab8 am: eadb78282f am: 7ef60829fc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ec53269847c1af543d1374863f084b06b2875ff