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

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

Change-Id: Ib96973c8d8cea71bf33413e62379917f0aa8ba2c