Merge "adb-remount-test: Refactor raw remount & remount from scratch test" am: 78430afc

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



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