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