[automerger skipped] Allow apps with MANAGE_USB_STATE permission access to all USB am: ea89c0e7 -s ours

am skip reason: Merged-In I8c574e18192a768a4a202acd891ec258c106deae with SHA-1 e22c826c is already in history

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

Change-Id: I3da990e4bac35eee7421ed0dd61e3f91be3c4438