[automerger skipped] Merge "update carrier id list to version 5" am: d96849b747 am: 9847b108af
am: dc37fa6fab  -s ours

Change-Id: I2ceb3b1f9b6cb70c8071618a0807c422fd20772c