Merge changes I50d5ce3a,I84a636ba into rvc-dev

* changes:
  Notify adb service on usb disconnect and activity stop
  Revert "Don't dismiss adb authorization prompt upon USB disconnect."