Merge "Add PermissionIndicatorAppOpUsageTest" into sc-dev