Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev am: 653e7bedb4
am: f598369c15

* commit 'f598369c1544442ff606dd092717cbba973c9333':

Change-Id: Iccb92b801420ef852dda2a9f8bf5416baba0700f