Merge "adb-remount-test: Refactor restore()" am: 3a6ec217 am: a6a23506 am:...

Merge "adb-remount-test: Refactor restore()" am: 3a6ec217 am: a6a23506 am: fd3a2d92 am: 491bc824 am: 3cc84c98

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



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