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

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1457177

Change-Id: I37afc08103486a82b1b7be1d2fa40afd5b4cb4a9