Merge "Filter AppOps to show PHONE ops on all users"