Merge "Reset any non-runtime permissions with user sensitive" into rvc-dev am: 5db9071c am: 76251f71 Change-Id: I7852be1dd16e471cb9a338529c829a8f51092733