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

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

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



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