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

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



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