Merge "Revoke the uri permission when the file is deleted" into pi-dev am:...

Merge "Revoke the uri permission when the file is deleted" into pi-dev am: 2b52397d am: 9095b67c

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

Change-Id: Ic42474e16756dbd77c3a343ba1f7cbf95b2c10c8