[automerger skipped] Merge ab/AP4A.241205.013 into aosp-main-future am: 0f3a9515 -s ours

am skip reason: Merged-In Idf22d6e72e7d618ed98e869142b5cc5dc785985e with SHA-1 bff27edb is already in history

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



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