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

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

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



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