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

am skip reason: skipped by user pscovanner

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

Change-Id: I2a8c940a112c54a90de0972d1f08a86f46d347ad