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

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

Change-Id: I590b5e20cc4e835fe9696182157d7538607211ec