[automerger skipped] Merge changes Ic8a8adb3,Ia972c74d into qt-dev am: 94bf36bd92 am: 22ccf36b1b -s ours am: f83d417dd5

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599825

Change-Id: I1333912b9da7b13475b5800ea27e0af87e7578b5