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

Change-Id: I838d9757da581953dcb14befb33e01420c85801a