Merge changes Ia94ca352,Iad72a3e6 into qt-dev am: afc6787a4d

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

Change-Id: Iacfa968c49beb05f69882d890eefae89766daf68