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

Change-Id: I8d5c7616cd31407a8b041a170309c64b700743c8