[automerger skipped] Merge changes Ic12e91a2,I801bd1cb,Ibf1ccc7f,Icfb2e213,Icc0b7d91 into qt-dev am: 730aeaea8d -s ours

am skip reason: Change-Id Ie2c4d6b62922b1c94badacec10379df7dd5cab5d with SHA-1 d5d0bf4163 is in history

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

Change-Id: Id224fb0b8d10a74963ec29d21e87ef72c0f0bc7a