[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 87386576 -s ours

am skip reason: Merged-In Iccb22027040315514c73bbb228d118dd03182635 with SHA-1 a1b5763f is already in history

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



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