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