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

Merge "set-verity-state: Simplify code path around overlayfs_setup()" am: b3e303ca am: 2aa2e7f9 am: 8990b4b2

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



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