Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev