[automerger skipped] Merge Android 12L am: 77d235d6b9 -s ours am: 6d4406037f -s ours

am skip reason: Merged-In I947ab15dae07501ee61edbd94cb937c2299f865b with SHA-1 38aba3e97b is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2012790

Change-Id: Ifa6c79ea37f878d57ee11ba0c6df16d37d68730d