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

am skip reason: Merged-In Id5f7de88e6ef85834a6003e99fa6c9f2a45b6531 with SHA-1 27acac0478 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/16279467

Change-Id: Iadcf3ab9ecacef9e32ab51aad7cb548427da61ff