[automerger skipped] Merge "Revoke the uri permission when the file is...

[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into rvc-dev am: ac411bea am: a4657844 -s ours

am skip reason: Change-Id I4ffb183630aadb2d87b0965e8cecf88af15f4534 with SHA-1 5afa7645 is in history

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

Change-Id: I5e55f19ef4557cc3475b6e01738f8472607df26a