[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 57e0210a -s ours am: ddb65dbf -s ours

am skip reason: Merged-In I37a8e621c2e06e41e29076b1671e525b53810bde with SHA-1 02944860 is already in history

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

Change-Id: I90b480aab46d69a44cbffa95e5fe25173ada41cd