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

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

am skip reason: Change-Id Ieb581e35361327e29f5ffd4ea71abeb51f1e27b2 with SHA-1 7836d2bc is in history

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

Change-Id: Ic820c9aa30336e761b14d74a7dec6e1d3dcc822d