Merge changes Ia6247be7,Ie93b2eb7,I185986c6,I5f9999ba,I78300cd3, ... into qt-dev am: c5d94085a3 am: b0dbb7533a am: 27c99fcc91 am: d807e56e15 am: ba0871fc61 am: f755c6c8ed am: c5868bf382 am: 1cdeffe6e6

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

Change-Id: I41f4dc51aee09e2ea38865ff71cf3c7de137c84f