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

am skip reason: Merged-In I9b94d270148d8ce5fa97f88f460d8c03eac3873c with SHA-1 ca9f9f2266 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16844362

Change-Id: I371d6ed9284634f888d6a38eee81385976c6d4fe