Merge change 20005

* changes:
  Use USB notification instead of battery notification for USB debugging warning.