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

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

Change-Id: I93aff30932b836e8e22c0dd5f03a392707832131