[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am:...

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 7940ef5d -s ours am: 74835ff4 -s ours

am skip reason: Merged-In I5bcbfed8ac4f4eadc62c8661d9e6f9dc01908b1f with SHA-1 cd67f62c is already in history

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

Change-Id: I349965df998f614a92165a3d1c441e58be03c5dc