[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into pi-dev am: 2b52397d56 am: 9095b67c84 am: 78c8bbdfaf -s ours am: df27db3f0b -s ours am: 4625abf351 -s ours

am skip reason: Change-Id I4ffb183630aadb2d87b0965e8cecf88af15f4534 with SHA-1 2c80a71789 is in history

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

Change-Id: Ib62cca6b24250f82af841af4d90f963defdeb526