Merge "Reset mode for app op permission when app no longer requests it." into...
Merge "Reset mode for app op permission when app no longer requests it." into rvc-dev am: 9ddbdbf2 am: 77a431ac am: 71fb1749 am: 14175cb2
Change-Id: I64eb24c9b81292cbbf2dd8de1e37ebb6bd601d51