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

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

Change-Id: I8bf446f90458e211d5204dfbc5c414785439bb69