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

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

Change-Id: I8ed625f7722b4e14a5fca8c8f2b4d56a983b6f07