[automerger skipped] Merge "Ensure storage permission revoke happens for all users" into sc-dev am: 6c1ae930 am: faf59e2b -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/+/14355171

Change-Id: I21165d6640289f2db7bd40ae0042c19e36b335a6