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

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

Change-Id: I2bbe94c5602455cc38da4268e6af90b020006d73