Merge "set-verity-state: Use ro.boot.veritymode to determine current verity state" am: d40fd73e

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



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