Merge \"Fix javadoc broken links in DocumentsContract.\" into nyc-mr1-dev
am: 0e7bb571fd

Change-Id: I45a178f0897fd837307131007529286ca4af0025