Merge "Restrict adding the implicit READ_URI grant flag." into udc-dev am:...

Merge "Restrict adding the implicit READ_URI grant flag." into udc-dev am: 0bb91e1d am: 40d0b255

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



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