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

Change-Id: I84ca0f9eb3cfc04852b30c9574173a13e9907c98