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