Merge changes Ia94ca352,Iad72a3e6 into qt-dev am: afc6787a4d am: f5b3b0211f am: d5ece0c9db am: 3a134692da

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

Change-Id: I94135b2b8d9169543f79e2a5bbb467ed9c24ca74