Merge changes Ib51be068,If07e7dfa into qt-dev am: a88fde2ab8 am: eadb78282f am: 7ef60829fc am: 0c3e764992 am: d77e87063a am: c484040e06

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6328a215752f9f57d9262983a67a53651a188487