Merge "Revert "[Settings] Remove CarrierConfigManager.Apn.KEY_PREFIX from API"" into sc-dev