[automerger skipped] Merge "push new carrier list" am: 41c91176fd
am: 9f165afd09 -s ours
am skip reason: change_id I48156004e4330680dd8917cbf80e4b35ff329fea with SHA1 71264e6297 is in history

Change-Id: I4fb800694e875972535d11bcf46ef019b95b8d99