am 4f3d5c75: am 1eb06eaa: am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev

* commit '4f3d5c75e09c7d1562506ea792428ac5a0241561':
  Add per UID control to app ops.