Merge "Avoid removing USB state changes during CONFIGURED uevent" am: 6b8b9efad1 am: da70fd1af3 am: a87ed3d36b

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

Change-Id: I82b80ef0e935f8cafba2d3b9ec527b55cbde8e5a