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