Merge "Refactor: Move GSI AVB keys selection logic to common code."