[automerger skipped] Merge "Merge Android 12L" am: c0061923 -s ours am:...

[automerger skipped] Merge "Merge Android 12L" am: c0061923 -s ours am: b83a9162 -s ours am: 481d9e26 -s ours

am skip reason: Merged-In I10f5fcb9874bed209a70e61db875afcf6d7c9795 with SHA-1 95409114 is already in history

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

Change-Id: Ied6236b3a30a0248e53f32f4b2e0aa69059d295c