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

[automerger skipped] Ensure storage permission revoke happens for all users am: 37acd7ee am: 9fd3879e am: daa48cb5 -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/+/14351820

Change-Id: I797cc4e8f23b4996eb855ed98286e4f98dffd59d