Merge "Add assets/carrier_list.pb in TelephonyProvider" am: bc0610b67b am: 68477ac4a9
am: adf65c93a7  -s ours

Change-Id: I9a1d489dcb1b8aa94f8d45f07f9d59e2ba56ea89