Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev