Merge "Revert "Reset any non-runtime permissions with user sensitive"" into...
Merge "Revert "Reset any non-runtime permissions with user sensitive"" into rvc-dev am: ceeef843 am: 3b7becf0 am: 5865ab41
Change-Id: I580aa349207ba617bd6a7eeedeba2363ed3c1012