Merge "adb-remount-test: Refactor remount -R & disable-verity test" am:...

Merge "adb-remount-test: Refactor remount -R & disable-verity test" am: 64198bc2 am: 997ab30e am: a0287e2d

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



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