Merge "Remove unused AppOpsManager references"