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

[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into rvc-qpr-dev am: 0827205f am: c0c15697 -s ours

am skip reason: Change-Id I4ffb183630aadb2d87b0965e8cecf88af15f4534 with SHA-1 9efd606f is in history

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

Change-Id: I46bf1852a0cd3af15aa54f3eb23ce0c2bbe1c3c5