[automerger skipped] Merge Android 12L am: 61c1f462 -s ours am: a67d513b...

[automerger skipped] Merge Android 12L am: 61c1f462 -s ours am: a67d513b -s ours am: 77b24aa4 -s ours am: e51b113f -s ours am: d676cb88 -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: I1f87fc338684e5a6816c619c2c6185e9db55787c