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

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

Change-Id: I07eedad3dff519386abb45a172e8c26d837574e5