Merge "cp sdk 28 carrier id list" am: 9cf12c4d7a
am: 0d1c9d6223

Change-Id: Ia36f930a16626c40d2eb48395aacab0d7bf893b6