[automerger skipped] Merge 24Q3 to AOSP main am: 6cc7f80cfa -s ours

am skip reason: Merged-In I512be49eb51bcd912c5d1ec87260ee45b0f8b35c with SHA-1 905b8f09d0 is already in history

Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/3258375

Change-Id: I846f00ab4e4449a133f2d0e5169c30489c9c9186
Signed-off-by: Automerger Merge Worker <[email protected]>