Merge "Revert "Use carrier config API entrypoint"" into mnc-dev