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

Change-Id: I219e199647533a22eecf9cb0cdf29057f37798e6