[automerger skipped] resolve merge conflicts of...

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

am skip reason: Change-Id I4973247ab66704c16446c47c6fd830a21ea2504f with SHA-1 1e463f60 is in history

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

Change-Id: I7ec54fccf50fd39eefd34f7da8a768913dc20161