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: 4f9337dd
Change-Id: I7329473bc47e8952e2b1845e3d5f6d8d1fa67270