Merge "[Provider Model] Support 2+ lines instead of marque for Mobile data and Wi-Fi"