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

* commit '8dbd48485044b1ab25fb8fb5e8e9b9772a3478c4':
  Add per UID control to app ops.