Merge "usb: remove duplication in descriptor reading code." am: b612fc8f4f am: 2a4deb3988

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

Change-Id: I20550ead86ec32082704318637c46cbd80a74169