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

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

Change-Id: I4fd7af2c6f3827c68151d35b2c6dff1c4730d2c8