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

Change-Id: I62fee3743345a8a5861d2feff53a432204a590f8