Merge "expose some Telephony.Carriers cols system APIs" am: f2e0f57976 am: bb0689b6d5
am: 76819cc048

Change-Id: Ie98dd2591f8f83d00751a6e78af54c06b75314d7