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

am skip reason: Merged-In I96f429ec3284114868ad220ea308a6920930c065 with SHA-1 421324351c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/30626201

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