[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: 0b047d73 -s ours

am skip reason: Merged-In Ib39ba935727df0bc1ab4030bcfe8301de7e64805 with SHA-1 82f3463d is already in history

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



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