Merge "Reset any non-runtime permissions with user sensitive" into rvc-dev am: 5db9071c42 am: 40ee4c4947 am: 1c054e0229

Change-Id: I9ea004fa6ad4f9e5f37505596cdd6558a5e3064c