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