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

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

Change-Id: I62819572f7c0ffc7fae73ceeebb1992d55bda958