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

Change-Id: I5d19d10029907e3dc0eb131ab2d154d748a4bacf