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

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



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