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

[automerger skipped] Ensure storage permission revoke happens for all users am: 37acd7ee am: 59e325d9 -s ours am: 8b0549a2 -s ours am: bfde0255 -s ours am: 7e43ebe0 -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/+/14351820

Change-Id: I996669afe3210ebc08f5fe36316a48733d4ad0c3