Merge "remount: Check device mapper to see if verity is already disabled" am:...

Merge "remount: Check device mapper to see if verity is already disabled" am: a6844e4c am: 206363ed am: 9b89a771

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



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