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: 9845d86c am: 850ce47e
Change-Id: Id7c64031aecbf212a1916b75f6e012cb9c21df40