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 am: 63c921c9

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



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