Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce

Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3