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

* commit '2ba3fec6e0222754d93ed7a491354164d113ad6e':
  Support waiting for adb shell am stop-user to complete.