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

Change-Id: I53eb75dde1f767e61ce96056aca4fdb7c79763ef