[automerger skipped] Merge "Check Uri permission for...

[automerger skipped] Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION" into tm-qpr-dev am: 8ccf48b0 am: e2fa5013 -s ours

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

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



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