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

Change-Id: Ib9646970cdb312276c11cbecba1d9616c1070b5b