[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 0d8b8125 -s ours

am skip reason: Merged-In I42fd618b5a018abd57e6eab4fe4ed6ba9f70a235 with SHA-1 d540a6b9 is already in history

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

Change-Id: I5ff34569b581a3b0585c45089b7d4db53781502b