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

Change-Id: I079aabb4449d5425e56a9e4aea05260b1b80ede9