Merge changes from topic "fsverity-init-cleanup" into main am: 42164ff9

    # Must start after 'derive_classpath' to have *CLASSPATH variables set.

    start odsign

    # Before we can lock keys and proceed to the next boot stage, wait for

    # odsign to be done with the key

    # Wait for odsign to be done with the key.

    wait_for_prop odsign.key.done 1

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

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

    # Bump the boot level to 1000000000; this prevents further on-device signing.

    # This is a special value that shuts down the thread which listens for

    # further updates.