Merge "Add Glass Enterprise Editions to USB driver." am: 81824d0b8e am: 9e7eab273a am: a6e357d0e3 am: 4cb83ddb6c

Original change: https://android-review.googlesource.com/c/platform/development/+/1387484

Change-Id: Idfcd58c07e0480e317eac8fbc2c26c05f245c78a