Merge "adb-remount-test: Refactor prologue & /sys/module/overlay mining" am:...

Merge "adb-remount-test: Refactor prologue & /sys/module/overlay mining" am: 2e0913ce am: 46786814

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



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