Merge "DO NOT MERGE New carrier config enhanced_4g_lte_title_variant_int" into pi-dev
am: 48186ba033

Change-Id: Ia2f1f8312744c4018194f1a96d237ee0ab2a5510