[automerger skipped] Merge "Merge Android 12" am: 9243f909 -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 9243f909 -s ours am: f5320529 -s ours am: 7982b965 -s ours

am skip reason: Merged-In Ifb27b3eb12454fa96f07e6797745c697b4f831c4 with SHA-1 adcb6a27 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1847658

Change-Id: Iad742ad797f64963e53f0bb8f98d10c86bd1d884