Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION" into...

Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION" into tm-qpr-dev am: 8ccf48b0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727250



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