Merge "Revert "Add CTS for CarrierConfigManager public API.""