[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 61302f297c -s ours

am skip reason: Merged-In Idd70cf3d846fad1a25060ebfb6ae6a99599fd861 with SHA-1 d43a6e1c5a is already in history

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

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