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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513929

Change-Id: I16fa8acaae7b31ff423af630000c0ca949e3ae47