Merge "KeyMaster: support boot,vendor patchlevels" am: 2c56b86b55 am: bf75e6ac84

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

Change-Id: If0c66c84839a83b7e6802810d856de0806246a7e