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: 9f4e8b88 am: 7afb6a13

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

Change-Id: I8fccf255f3645c670581235c734ae11df997cb92