[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce am: 6ea2228e31 -s ours
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae38169 is in history
Change-Id: Ib8683709fc213875d6e9357544b54bb404effc3e
This commit is contained in: