Merge "Ensure storage permission revoke happens for all users" into sc-dev am:...

Merge "Ensure storage permission revoke happens for all users" into sc-dev am: 6c1ae930 am: 21b38197

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14355171

Change-Id: Ie0a527c143910b545a5cd288457014c92e62f876