[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into qt-qpr1-dev am: 5049badc18 -s ours am: 58de12e489 -s ours am: 35ee95531b -s ours am: 5f5de9bea6 -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/+/12455566

Change-Id: I4f3eaba7c7743bb92618a99d920736842fe3e18e