Merge "Fix the signing error in gsi_arm64 builds" into android15-tests-dev