Merge "Merge "Remove references to permissions in docs of flagged APIs" into udc-dev am: d96b5ba8 am: d64829f2 am: a320d307" into udc-qpr-dev-plus-aosp am: 468da859

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



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