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

[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into pi-dev am: 2b52397d am: 9095b67c am: 78c8bbdf -s ours am: df27db3f -s ours am: 4625abf3 -s ours am: 7ff3bd1d -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/+/12455472

Change-Id: Ia873492d8b9e55244aa767e43aae034c6a48cafa