Merge "[automerger skipped] Merge "Ensure storage permission revoke happens...

Merge "[automerger skipped] Merge "Ensure storage permission revoke happens for all users" into rvc-qpr-dev am: 9e639ddd -s ours" into rvc-qpr-dev-plus-aosp am: 47592cbc -s ours am: aac9987a -s ours am: 5985588d -s ours

am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 8a1085bd is already in history

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

Change-Id: Ice3800d8282b946d56e9e9fcbed642061abe0a60