Merge changes from topic "revert-1660531-max-boot-level-crypto-KFMCEDKSIV"

* changes:
  Revert "Expose AID_KEYSTORE"
  Revert "Set earlyBootEnded before apex starts"