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