Merge "Merge \\"docs: fixed broken link in UsbManager javadocs\\" into nyc-dev am: 162a6fad72 am: 3e15a43732" into nyc-mr1-dev-plus-aosp