Merge "Update carrier_list.pb and .textpb" am: f6b4f5dd97 am: 09febe4672  -s ours
am: 1d628cbee8  -s ours

Change-Id: I253c4c3e8429f8fe2f56eca1a7eb342b89f6394e