[automerger skipped] resolve merge conflicts of 47ba91cd to qt-qpr1-dev am: 952f59cc -s ours am: 9d5a66fe am: 27b772ae

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

Change-Id: I54f1c78f6da99715748a28afe15b9e85184851da