[automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future am: ff902d4fd9 -s ours

am skip reason: Merged-In I188263ee9b186736a48fd3a0cfa83745e2e54108 with SHA-1 e15af041dd is already in history

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

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