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

am skip reason: Merged-In I317342f66ebab949158f9d8480f57eacfa5c786d with SHA-1 647214b144 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16277910

Change-Id: I5379fb98545323264da0194538d22fa12c2debf6