[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: c17d0c2996 -s ours

am skip reason: Change-Id I3ba99b0a408587d10abc81089d485cad4cde0853 with SHA-1 27a1583b49 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bramble/+/13122802

Change-Id: Ia01580f1c27d1d8b45e2f347199da920e7fc57db