Merge "adb-remount-test: Simplify disable-verity setup" am: 05ae1f5f am:...

Merge "adb-remount-test: Simplify disable-verity setup" am: 05ae1f5f am: 397fc427 am: 1f1f1509

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



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