[automerger skipped] Check Uri permission for...

[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b9 -s ours

am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f9132 is already in history

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



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