Merge "adb-remount-test: Miscellaneous fixes - 2nd round" am: 9a0a9db6 am:...

Merge "adb-remount-test: Miscellaneous fixes - 2nd round" am: 9a0a9db6 am: b7813447 am: f2968abc am: 93f3aafa

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



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