Merge "Enable MS OS descriptors for adb." am: cbb51b15fe am: e6cd994315 am: cda67e1a16

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1797476

Change-Id: Ic3804b02ed8c27596cfeb77e61bef5bd99d75073