Merge changes from topic "max-boot-level-crypto" am: de2769dc1e am: e5c1b5691c

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

Change-Id: I37ad486598817bd69441b4aa56b480fb0e434edd