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

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

Change-Id: Ib7db87cb2673d4bb1040bc35bebe3723708a2278