Merge changes from topic "revert-1665499-revert-1660531-max-boot-level-crypto-KFMCEDKSIV-WPIHELCRFI" am: 61abbef4e4 am: e16255c8bc

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

Change-Id: Ia31d1412c64c1352f3d4f1e07535e5644340b0ac