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