Merge "Add assets/carrier_list.pb in TelephonyProvider" am: bc0610b67b
am: 68477ac4a9

Change-Id: Ie79c7db7edee9732e22bb7983a37ff48cdb702ad