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

Change-Id: Id6f4e9bd53a64a03bb0339404e3dbc5c880e3fcc