Merge "Revoke the uri permission when the file is deleted" into rvc-dev am: ac411bea

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

Change-Id: I6748a16848d518c2cbe79c8cee48df0c40f8e52c