Merge "Merge "Update link for Permissions samples in Javadoc" am: a7564ec1"...

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

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

Change-Id: I16fa8acaae7b31ff423af630000c0ca949e3ae47