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 am: 883ec23f am: b3c45a87 am: 7c5516d5

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



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