[automerger skipped] resolve merge conflicts of...

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

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

Change-Id: Ia573dd08cdc29262f9757b2c7823115dfd6e10f4