[automerger skipped] Merge "Fix the signing error in gsi_arm64 builds" into android15-tests-dev am: f2e683ab -s ours am: 2649524e -s ours am: 864157c7 -s ours

am skip reason: Merged-In I551e14fa6a0c63e3cef334b953f670cf9c465e10 with SHA-1 36981b54 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3433400



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