Revert "Use carrier config API entrypoint"

This reverts commit 52a93ff69cb87ee2ab7e75a2d3d64dcf502b4096.

Change-Id: I8100a135be60c8a02c505aa8549db2b42a392935
4 files changed