Merge "adb-remount-test: Refactor remount RW test" am: b1e4f98b am:...

Merge "adb-remount-test: Refactor remount RW test" am: b1e4f98b am: 38ee1028 am: e1926908 am: a6ac072c

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



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