[automerger skipped] TrustyKeyMint: support boot, vendor patchlevels am: 830ea32e am: 9a67d733 -s ours am: cdabb19a -s ours

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

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

Change-Id: I861f6992189a40aba1540b32ef802e1ce4f13756