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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6ed1407998d92f049e699e4bc5e5ef9eb290f40