Merge "init.rc: start update_verifier instead of update_verifier_nonencrypted" into main am: 6044e8e444 am: 0e1f4b17ca am: 5a737c89e8

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

Change-Id: I08d9ba550093809901b35c54f621e82a1720ebf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>