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

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

Change-Id: I4d9259997d3095cafcd3a981ba9d1c1b4dc1daab