Merge "set-verity-state: Refactor & remove even more dead code" am: 2db51770...

Merge "set-verity-state: Refactor & remove even more dead code" am: 2db51770 am: 1c209f86 am: bb9e4e22

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



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