Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7
am: 0886b927ec
am: caaa9b5ad3
am: d0af508413
Change-Id: I36f8f9f73cae8b95588e930d09b6b9e8b06d0ba4
This commit is contained in: