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

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

Change-Id: I19ac52f354870471114dfbf2c3720da930297460