Merge "[automerger skipped] Merge "Ensure storage permission revoke happens for all users" into rvc-qpr-dev am: 9e639ddde5 -s ours" into rvc-qpr-dev-plus-aosp