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

Change-Id: I53e8485f07a5f12d89dd462e1c0a2144d1b4e724