[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 7e2b98ed -s ours

am skip reason: Merged-In I67149c6faa2766be6d2537f2315dd2734bdd0447 with SHA-1 83b55b6a is already in history

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



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