[automerger skipped] Merge "Revoke the uri permission when the file is...

[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into qt-dev am: e1379873 -s ours am: abb15719 -s ours am: 56fe6ed0 -s ours am: 8bfc1ddd -s ours am: f727da6c -s ours

am skip reason: Change-Id I4ffb183630aadb2d87b0965e8cecf88af15f4534 with SHA-1 2c80a717 is in history

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

Change-Id: I0043bbef95ef51150ca954824e2a9816f8257c70