[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946 -s ours am: cef3637f4c -s ours am: 5772502644 -s ours am: 669dad7687 -s ours am: eb6daa6e20 -s ours

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

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

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