[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available"...
[automerger skipped] Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8 am: 6ea2228e -s ours am: 5d03f7d6 -s ours
am skip reason: Change-Id Iecf3e385a88d18c7578eb520449f4042324e21f5 with SHA-1 e6fae381 is in history
Change-Id: Id9b46e36d8665e6a2a15686ace384c05edc5ecff