Merge "Fix typo in CarrierConfigManager javadoc."