[automerger skipped] Merge Android 12L am: 61c1f4628b -s ours am: a67d513bc7 -s ours am: 77b24aa4ee -s ours

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

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

Change-Id: I3b27bd8e2dae9e8a38d56ec7984888ba517e902a