[automerger skipped] Merge "Merge Android 12 QPR1" am: b635a149bb -s ours

am skip reason: Merged-In I7a7c71438880823616a1e696dde71fbfc25a9375 with SHA-1 c5f7a68758 is already in history

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

Change-Id: Ief2d42de3cf3f1d8a164c1ff196332c7d56bd83a