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

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



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