Merge "Adding MANAGE_APP_OPS_MODES to FrameworksServicesTests" into pi-dev