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

Merge "[automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb am: 2f2fa37a -s ours am: ccf88a65 -s ours am: f498567e -s ours am: 4bca56e7 -s ours" into sc-dev am: f2054d68 -s ours am: 38dc8f93 -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/+/14357211

Change-Id: I51ee51206543330a80a769d43de1da6bd18c73a0