Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev