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

* commit '9a3d898a5802b4d3eb398fe618a4c2f202f96753':
  Add per UID control to app ops.