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

Change-Id: I723d75826bdcf2b52e73760069d1deb9b4369dda