[automerger skipped] Merge UP1A.230905.019 am: b77f10ef2f -s ours am: 10a9b1309f -s ours am: 2e4fbdca15 -s ours

am skip reason: Merged-In Iceea086345691cdad8ca5e092629de094d666de1 with SHA-1 2f99cdb915 is already in history

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

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