Merge "adb-remount-test: Refactor fastboot flash vendor test" am: a219a233...

Merge "adb-remount-test: Refactor fastboot flash vendor test" am: a219a233 am: 538a3f0a am: 9d69a4f5

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



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