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

[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into oc-mr1-dev am: 90649404 -s ours am: 368565ac -s ours am: b3767c4a -s ours am: fd8de208 -s ours am: db177c47 -s ours am: ffdd414b -s ours am: 276979b4 -s ours

am skip reason: Change-Id I4ffb183630aadb2d87b0965e8cecf88af15f4534 with SHA-1 773bec18 is in history

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

Change-Id: I1ab6b2629c47cde2f9cfb4ce9b3016d030c583a5