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

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