Merge "remount: Treat disable verity error as fatal only if verity is enabled"...

Merge "remount: Treat disable verity error as fatal only if verity is enabled" am: fb9b7de4 am: 7ab74445

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



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