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 am: 889c44d4

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



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