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

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

Change-Id: I0a6809b6acc6213abed97ef8d6899c786e39a9b1