[automerger skipped] Merge "latest carrier list including VZW MVNO cellcom" am: a8311d40c7 -s ours am: 9e119f9be0 -s ours
am: 305e43656e -s ours
am skip reason: change_id Ib91dc044a5a2a0ca0de82a8df2922f33e319f771 with SHA1 1dad099260 is in history

Change-Id: I66525908cca3ff9f231ea28394205807ca17f108