[automerger skipped] TrustyKeyMint: support boot, vendor patchlevels am:...

[automerger skipped] TrustyKeyMint: support boot, vendor patchlevels am: 830ea32e -s ours am: 8d8c5ac3 -s ours

am skip reason: Merged-In Ie42345112b08ef9c669535cef2de60ea77da15b4 with SHA-1 e7697d71 is already in history

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

Change-Id: Ie5fd7ca06923e95a51ce121a982b5327bf5939ed