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

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



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