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

[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into qt-qpr1-dev am: 5049badc -s ours am: 58de12e4 -s ours am: 35ee9553 -s ours am: 5f5de9be -s ours

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

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

Change-Id: I4f3eaba7c7743bb92618a99d920736842fe3e18e