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

Change-Id: I39fa9903ca0b3709fe420f80cfa0a3ae32a28537