Merge "Ignore MAX_BOOT_LEVEL tag" am: dd1a028e37 am: e6f92b0276

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65e81820391ff93ca39665957f31f87ddb882dd7