Merge "set-verity-state: Simplify args parsing logic" am: f78b2d17 am: 742c3c5e am: 4ae347a6

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



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