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

* commit '1eb06eaaef5b56cd71a7cc7e9f5cd5d2b199f420':
  Add per UID control to app ops.