[automerger skipped] Merge UP1A.230905.019 am: 75da5da9cc -s ours am: 5f4953b703 -s ours am: e63ac57223 -s ours am: 33489f5a2e -s ours

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

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

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