Always use PermMgrSrv APIs to change permission am: cf5e437b6c
am: a1716844da

Change-Id: I3cc43d6b4c4b1644be9f88f02a8f218c0a223957