[automerger skipped] Merge UP1A.231005.007 am: e0ea984e37 -s ours

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

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

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