Merge "Merge "docs: Update permission samples link" am: f50d6de6 am:...

Merge "Merge "docs: Update permission samples link" am: f50d6de6 am: 2216b4cd" into tm-qpr-dev-plus-aosp am: e7bdf78d am: f1b9a420 am: c91dabde am: ffc775de

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



Change-Id: I23a0ed2827def8442d02bc28548f61fb3700aabf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>