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

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

Change-Id: I03f7c4e42ea7db8c8b80a8380eb15c83c8189e65