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

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