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

* commit '99d041def30f2a7438280896116b2500e4344c84':

Change-Id: I87e1ae48a5793d39a7efd87e5e15fd1c61d4f0fa