[automerger skipped] Merge "Merge Android U (ab/10368041)" into...

[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: aec56730 -s ours

am skip reason: Merged-In I9b175092d433fc6d7b22b437a09d76d3d2e0ce14 with SHA-1 b7bc7af7 is already in history

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



Change-Id: I497f35d54c6b4fb36e15ae4ed5d2a991f37e3d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>