Merge "Fix typo in CarrierConfigManager javadoc." am: ea598a4f14
am: 3a443cd347

Change-Id: I861ab8f591597e4e13e5c2bcf81546a5692b519a