Merge "Add permission checking APIs that look at both permissions and app ops." into mnc-dev