Merge "Add per UID control to app ops." into mnc-dev