Merge "Fix incorrect javadoc for Uri.getQueryParameter."