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

Change-Id: Ie329d879eb138c3489df5a8ed59b4da37f0ed41d