Merge "Split fsverity_init in two phases." am: cd91f866

    # HALs required before storage encryption can get unlocked (FBE/FDE)

    class_start early_hal

    # Load trusted keys from dm-verity protected partitions

    exec -- /system/bin/fsverity_init --load-verified-keys

on post-fs-data

    mark_post_data

    wait_for_prop apexd.status activated

    perform_apex_config

    # Lock the fs-verity keyring, so no more keys can be added

    exec -- /system/bin/fsverity_init --lock

    # After apexes are mounted, tell keymaster early boot has ended, so it will

    # stop allowing use of early-boot keys

    exec - system system -- /system/bin/vdc keymaster earlyBootEnded

    class_start core

    # Requires keystore (currently a core service) to be ready first.

    exec -- /system/bin/fsverity_init

on nonencrypted

    class_start main

    class_start late_start