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

am skip reason: Merged-In Ia311da0b8176fdd7b3c820a6c6fa11db162f1209 with SHA-1 3b61a30fd1 is already in history

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

Change-Id: I3b122406992629d58faf098427e22e8040927567