Merge "Update carrier_list.pb and .textpb"
am: f6b4f5dd97

Change-Id: I37284ca60ce5507125e5b70d4131b47cfaafb83c