Merge changes from topic "am-5945f34d83bd47e39e93546db3757d9d" into main

* changes:
  [automerger skipped] Merge "Fix the signing error in gsi_arm64 builds" into android15-tests-dev am: f2e683abac -s ours
  [automerger skipped] Fix the signing error in gsi_arm64 builds am: 81e841722e -s ours