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

[automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb am: 2f2fa37a -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/+/14357211

Change-Id: I03963a30b550540252d33374c2bcb568ddfc0bd4