[automerger skipped] Ensure storage permission revoke happens for all users am: 37acd7ee am: 9fd3879e am: daa48cb5 -s ours am: 861d729a -s ours am: fe80cf35 -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: Ifeb8c54225ceada007dfe907f41a550cd3623c70