am e7359b09: am ef7deb90: am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev

* commit 'e7359b09c7ab50fa9d92f0df3dddecd8d0111682':
  Fix app ops regressions introduced by the per UID policy change