[automerger skipped] Merge changes Ic8a8adb3,Ia972c74d into qt-dev am:...

[automerger skipped] Merge changes Ic8a8adb3,Ia972c74d into qt-dev am: 94bf36bd am: 22ccf36b -s ours am: f83d417d -s ours am: 7b6d60b0 -s ours am: 3a2c7ac7 -s ours am: ddc5182d -s ours

am skip reason: Change-Id Ic8a8adb3fffb357754384ddbf13684d944a9767e with SHA-1 f037e1a9 is in history

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

Change-Id: I70ade42d963641fbcfe0a147df325b123f89c6ae