[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-dev am: ac411bea am: a4657844 -s ours am: 5415cd3f -s ours am: 93a3f5ed -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/+/12455468

Change-Id: Ief3f5e270d1cf50468c210e115810de7a720163f