Merge changes I9ed87db1,Ic0b766f6

* changes:
  Make PermissionControllerManager user aware
  Check same uid for permission and app-op