Merge "Don't destroy usb debugging dialog for emulator if usb is not...

Merge "Don't destroy usb debugging dialog for emulator if usb is not connected." into sc-dev am: b485b356

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14791950

Change-Id: Ie67a7d6fa624276a88cfb57bc00671c8310e3d06