Merge "Migrate CellIdentity.TYPE_ to CellInfo.TYPE_"