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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 7fa520a8 -s ours am: e26b6731 -s ours

am skip reason: Merged-In I984e9cd9eec5ac4981aa37d89d753518b6090d89 with SHA-1 fc1ed9df is already in history

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

Change-Id: Ib138ef9d826943cbbc373764d7dd67b64b8a18b8