[automerger skipped] Merge changes Ic8a8adb3,Ia972c74d into qt-dev am: 94bf36bd am: 22ccf36b -s ours

am skip reason: skipped by user kousikk

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

Change-Id: I74d2db25915ae9886cae6d8b5da76b0aa142b070