Merge "Add unit test for AppOps logic where a different op is used to control an app op."