Merge "Don't rely on AppOpsManager in systems without applications"