Merge "set-verity-state: Harden logic of overlayfs setup/teardown" am:...

Merge "set-verity-state: Harden logic of overlayfs setup/teardown" am: 7d294906 am: dd5ecb2f am: e933cee8

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



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