Merge "set-verity-state: Remove dead code that was used by AVB 1.0" am:...

Merge "set-verity-state: Remove dead code that was used by AVB 1.0" am: 83b12a5c am: 6467eedd am: dfce8425 am: 056c23d8

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



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