Merge "Add compat fwk call while checking APN permission"