Merge "remount: Simplify disable verity logic" am: d1b270ab am: 48b09efd

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



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