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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9197f7dc5f56cb0570e448857b56201fed5ca5bc