[automerger skipped] Merge "Merge Android 12 QPR1" am: b635a149bb -s ours am: 3716cc361f -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: I88942fdeea21cacde4ab3f6658e95786f3b3a815
This commit is contained in: