Merge "Add a unit test for the AppOps permission for displaying UI overlays."