Merge "Use device owner type to restrict a financed device owner"