[automerger skipped] Merge Android 14 am: ae461709 -s ours am: 0497616c -s ours

am skip reason: Merged-In Id9763fb487e94440df2e61fbb7910902baa12fa8 with SHA-1 3af3c58a is already in history

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



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