Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: 0886b927ec am: 20876aa35e am: cedd5b1e5c am: 5496e4c29b am: b25bb4fbb7
Change-Id: I97fbf500c5c185254be36776f55134b778669edc
This commit is contained in: