Merge "KeyMaster: support boot,vendor patchlevels" am: 2c56b86b55 am: bf75e6ac84 am: 6a9017690d am: 359712a7b7

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

Change-Id: I6f619354b3e0a187889849cabe5c892f75430717