Merge "Allow per-package exemptions for restricted AppOps" into nyc-dev am: 89db9dbedb
am: c5630f8247

* commit 'c5630f8247141a346790ce9a5454629a0d297115':
  Allow per-package exemptions for restricted AppOps