Merge changes from topic "revert-1660531-max-boot-level-crypto-KFMCEDKSIV" am: 0da1d617d2 am: 3b7cf575f0 am: 6a9b8d0c9b

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

Change-Id: Idf27b63cb3475db8c0fa7dabb9ba73468f6b2c1c