Merge "Revert "Enable metadata encryption""

    # some services can be started.

    trigger late-fs

on later-init

    # Now we can mount /data. File encryption requires keymaster to decrypt

    # /data, which in turn can only be loaded when system properties are present.

    trigger post-fs-data

    class_start core

on nonencrypted

    trigger later-init

    class_start main

    class_start late_start

    start logd-reinit

on property:vold.decrypt=trigger_post_fs_data

    trigger later-init

    trigger post-fs-data

on property:vold.decrypt=trigger_restart_min_framework

    # A/B update verifier that marks a successful boot.