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

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

Change-Id: Ib76ebf943a1e11563126708ff7774c6935f425f9