Merge "Fix null pointer exception if USBPort is removed" am: 066cd28370 am: fd5364769f

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

Change-Id: Ia64a294b4059dfd76b67446a8153d2b41bf75d0b