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

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

Change-Id: I195e564cf34893c80afd9a07c46ac5229203be72