Merge "set-verity-state: Simplify code path around overlayfs_setup()" am: b3e303caad

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

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