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

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



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