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: 0501fed4 -s ours

am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 37acd7ee is already in history

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

Change-Id: If59484a4b5954db6d56c2538d88398a637a2c993