[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: b6f5a11a -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: Ief6592d697a1a0285d5cdc63e8add764b1d46a31