[automerger skipped] KeyMaster: support boot,vendor patchlevels am: 966ec24899 am: 08e0b28fbc -s ours am: a91ecf0cc1 -s ours

am skip reason: Merged-In Ia311da0b8176fdd7b3c820a6c6fa11db162f1209 with SHA-1 966ec24899 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/15337619

Change-Id: I62b16ab91a7c922b29e3f235850ec6d218429d81