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

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

Change-Id: I884671b1392b202c0e2c7ce6f167b7ef06ffcdd8