Merge "CarrierConfigLoader shouldn't use unsupported APIs" am: c5f00272f6 am: ecfc68f399
am: 99b36bd8d3

Change-Id: Ie0dbe05ef989fc7c90960c8351fda58a9d10cb83