Merge "Exempt device lock controller and kiosk roles from metered restrictions." into main