Merge "Keystore 2.0: Enforce MAX_BOOT_LEVEL in software" am: 720b5e46b2

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1571376

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22dd2bd4283b9d53064c2974a4b3ccc05d0b3f0b