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

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

Change-Id: I46865cbc3572d68f2ef738c95bcc05de8088f403