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

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