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 am: d3080f21

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



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