Merge "Don't discriminate getPhoneType against data-only devices" into main