Merge "adb-remount-test: Adb shell command could return 0 or 255 if device is disconnected" into main am: b6fc19c308 am: b1aa489b06

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

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