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

Change-Id: Icc9bf9837fa0d8c92e16335b327363f8f3e3167b