Merge "Merge "Update link for Permissions samples in Javadoc" am: a7564ec175" into stage-aosp-master